From e8b7bb3e6184c29238f714947660eeba659c1970 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 27 Aug 2012 16:47:58 +0000
Subject: [PATCH] debian-opt

Gbp-Pq: Name debian-opt.diff
---
 config_host.mk.in        |   1 +
 configure.in             | Bin 412009 -> 412181 bytes
 solenv/inc/unxgcc.mk     |   2 +-
 solenv/inc/unxlngi.mk    |   1 -
 solenv/inc/unxlngmips.mk |   1 -
 solenv/inc/unxlngr.mk    |   1 -
 solenv/inc/unxlngs.mk    |   1 -
 7 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config_host.mk.in b/config_host.mk.in
index 733f9041cde..d831556ba95 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -61,6 +61,7 @@ export CPPUNIT_CFLAGS=@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=@CPPUNIT_LIBS@
 export CPU=@CPU@
 export CPUNAME=@CPUNAME@
+export CDEFAULTOPT=@CDEFAULTOPT@
 export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
 export CPU_FOR_BUILD=@CPU_FOR_BUILD@
 export CROSS_COMPILING=@CROSS_COMPILING@
diff --git a/configure.in b/configure.in
index 95bd31c4bdd40bcb417e9ffb7eb77c17e986095e..cb17302f45b97eb393fcbbad7b0a6c50db87efe4 100644
GIT binary patch
delta 187
zcmaDkNpk8G$%Yoj7N!>F7M2#)Eo{FHLo(A8N>YnU6m%;T^h=A2^pi64^ivA5({+<d
zGjmeXauU;vtrbc#QuDYton2hr97BCV`~yO46VTKs=<24YmMA#8`8c`<PcQh+B;u&+
zs-T;%pcJF)A02I=YaAP^l)#mmQ=E!wkgmTGS6U{QqjP+4s8eu=29hO{FADi@cQ;~F
G5(fbMTRT7i

delta 31
ncmbO_Me^k&$%Yoj7N!>F7M2#)Eo{FHCtnfr+5XvxO-UR8#Ptin

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 2da3ef0f524..0d4cf9de788 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -31,7 +31,7 @@ ASM*=
 AFLAGS*=
 SOLAR_JAVA*=
 # default optimization level for product code
-CDEFAULTOPT*=-O2
+CDEFAULTOPT*=$(shell dpkg-buildflags --get CFLAGS 2>/dev/null | $(GREP) -E -o "\-O[0-3]" || echo "-O2")
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
 ARCH_FLAGS*=
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index 79c255c326a..40ff07d5947 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -26,7 +26,6 @@
 #*************************************************************************
 
 # mk file for Unix Linux Intel (X86) using GCC, please make generic modifications to unxlng.mk
-CDEFAULTOPT=-Os
 .IF "$(GCCNUMVER)" >= "000400050000"
 ARCH_FLAGS*=-mtune=atom
 .ELSE
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index 783305d6c9d..2e47da2c4fe 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -27,6 +27,5 @@
 
 # mk file for Unix Linux Mips using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DMIPS
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 81ee90ca4f0..c855716980e 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -27,7 +27,6 @@
 
 # mk file for Unix Linux ARM using GCC, please make generic modifications to unxlng.mk
 
-CDEFAULTOPT=-Os
 .INCLUDE : unxlng.mk
 CDEFS+=-DARM32
 CFLAGS+=-fno-omit-frame-pointer
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 390244f31d6..9827c22a725 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -29,7 +29,6 @@
 
 ASM=$(CC)
 AFLAGS=-Wa,-K,PIC -c $(CDEFS)
-CDEFAULTOPT=-Os
 PICSWITCH:=-fPIC
 .INCLUDE : unxlng.mk
 CDEFS+=-DSPARC
-- 
2.30.2